Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Fri, 8 Apr 2011 18:54:05 +0000 (14:54 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Fri, 8 Apr 2011 18:54:05 +0000 (14:54 -0400)

Trivial merge